(sort-coding-systems): Adjust

priority of utf-16 and x-ctext.

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index d5b7663c5f985d37724e77b82274519587f29b41..c70fa7a43a5130aca3d0d29a4f455d7209a5a287 100644 (file)
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -425,9 +425,18 @@ non-nil, it is used to sort CODINGS in the different way than above."
                    (let ((base (coding-system-base x)))
                      (+ (if (eq base most-preferred) 64 0)
                         (let ((mime (coding-system-get base 'mime-charset)))
+                          ;; Prefer coding systems corresponding to a
+                          ;; MIME charset.
                           (if mime
-                              (if (string-match "^x-" (symbol-name mime))
-                                  16 32)
+                              ;; Lower utf-16 priority so that we
+                              ;; normally prefer utf-8 to it, and put
+                              ;; x-ctext below that.
+                              (cond ((or (eq base 'mule-utf-16-le)
+                                         (eq base 'mule-utf-16-be))
+                                     16)
+                                    ((string-match "^x-" (symbol-name mime))
+                                     8)
+                                    (t 32))
                             0))
                         (if (memq base lang-preferred) 8 0)
                         (if (string-match "-with-esc$" (symbol-name base))